From 64a38bdb823f584284a1bf3fa3abef28690435b2 Mon Sep 17 00:00:00 2001 From: Kristian Rietveld Date: Sun, 20 Nov 2011 18:27:28 +0100 Subject: [PATCH] quartz: fix coding style in quartz-version of gtk_drag_begin_internal --- gtk/gtkdnd-quartz.c | 71 +++++++++++++++++++++++---------------------- 1 file changed, 37 insertions(+), 34 deletions(-) diff --git a/gtk/gtkdnd-quartz.c b/gtk/gtkdnd-quartz.c index 96af88f008..6b3d123b18 100644 --- a/gtk/gtkdnd-quartz.c +++ b/gtk/gtkdnd-quartz.c @@ -1141,22 +1141,23 @@ gtk_drag_begin_internal (GtkWidget *widget, } time = (double)gdk_event_get_time (event); } + nstime = [[NSDate dateWithTimeIntervalSince1970: time / 1000] timeIntervalSinceReferenceDate]; nsevent = [NSEvent mouseEventWithType: NSLeftMouseDown - location: point - modifierFlags: 0 - timestamp: nstime - windowNumber: [nswindow windowNumber] - context: [nswindow graphicsContext] - eventNumber: 0 - clickCount: 1 - pressure: 0.0 ]; + location: point + modifierFlags: 0 + timestamp: nstime + windowNumber: [nswindow windowNumber] + context: [nswindow graphicsContext] + eventNumber: 0 + clickCount: 1 + pressure: 0.0 ]; window = [(id)[nswindow contentView] gdkWindow]; - g_return_val_if_fail(nsevent != NULL, NULL); + g_return_val_if_fail (nsevent != NULL, NULL); context = gdk_drag_begin (window, NULL); - g_return_val_if_fail( context != NULL, NULL); + g_return_val_if_fail (context != NULL, NULL); info = gtk_drag_get_source_info (context, TRUE); info->nsevent = nsevent; @@ -1168,7 +1169,7 @@ gtk_drag_begin_internal (GtkWidget *widget, gtk_target_list_ref (target_list); info->possible_actions = actions; - + g_signal_emit_by_name (widget, "drag-begin", info->context); /* Ensure that we have an icon before we start the drag; the @@ -1178,30 +1179,32 @@ gtk_drag_begin_internal (GtkWidget *widget, if (!info->icon_pixbuf) { if (!site || site->icon_type == GTK_IMAGE_EMPTY) - gtk_drag_set_icon_default (context); + gtk_drag_set_icon_default (context); else - switch (site->icon_type) - { - case GTK_IMAGE_PIXBUF: - gtk_drag_set_icon_pixbuf (context, - site->icon_data.pixbuf.pixbuf, - -2, -2); - break; - case GTK_IMAGE_STOCK: - gtk_drag_set_icon_stock (context, - site->icon_data.stock.stock_id, - -2, -2); - break; - case GTK_IMAGE_ICON_NAME: - gtk_drag_set_icon_name (context, - site->icon_data.name.icon_name, - -2, -2); - break; - case GTK_IMAGE_EMPTY: - default: - g_assert_not_reached(); - break; - } + { + switch (site->icon_type) + { + case GTK_IMAGE_PIXBUF: + gtk_drag_set_icon_pixbuf (context, + site->icon_data.pixbuf.pixbuf, + -2, -2); + break; + case GTK_IMAGE_STOCK: + gtk_drag_set_icon_stock (context, + site->icon_data.stock.stock_id, + -2, -2); + break; + case GTK_IMAGE_ICON_NAME: + gtk_drag_set_icon_name (context, + site->icon_data.name.icon_name, + -2, -2); + break; + case GTK_IMAGE_EMPTY: + default: + g_assert_not_reached(); + break; + } + } } /* drag will begin in an idle handler to avoid nested run loops */ -- 2.30.2